Merge "Disable DevelopmentSettingsActivity by default"