Merge "Remove SystemUIDialog subclass from InternetDialog" into main