Merge "Fix the bug on CertInstaller changing orientation"