Merge "Introduce SettingsProx in place of Settings."