Merge "Fixed some rotation while unlocking screen issue." into oc-dev am: 0b138595de am: fa0543936c
am: 1c91f30de9

Change-Id: I503d5c009aa92f6299a4f8fe98489e34e716785e