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

Change-Id: I5f7e107cd0aa360152ac8a26f4d566f7aa16223e