Merge "Disable orientation switching on CryptKeeper screen"