Merge "Revert "buttons: Update focus for quiet buttons""