Merge "InternetIconInjector.getIcon should be open class." into main