Merge "DO NOT MERGE: Don't let keyguard to influence orientation when dismissing" into oc-mr1-dev