Merge "Move ActionButtonPreference into SettingsLib"