Merge "[RESTRICT AUTOMERGE] Refactor InternetIconInjector to SettingsLib" into sc-v2-dev