Merge "Update ActionButtonsPreference style" into sc-dev