Merge "Revert "buttons: Update focus state""