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

Change-Id: Icaaaca9735c18d10dcb414c82d2b6833c95ab6e9