Merge "Prevent CertInstallerMain from being recreated upon screenSize change"