Merge "Refactor InternetIconInjector to SettingsLib"