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

Change-Id: I9f263b5fb407dca34d9ba6d60c7296377b7f44bc