Merge "buttons: Update focus for quiet buttons"