Merge "Use SettingsShim to hide different implementation in shim"