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

Change-Id: I9cb5f092e253f06fc2abe4c90c9070ecf472125f