Merge "InternetIconInjector should be open class" into main