Merge "buttons: Update focus state"