Merge "Use SettingsLib's ActionButtonsPreference"