Merge "Don't set userSetLocale from Configuration.setLocale."