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

Change-Id: I31aa7938f945686bb3c5fc1efe84b27482fcc5cc