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

Change-Id: Ic30cff4e2b4224f035fae512cdee65f137b10836