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

Change-Id: Ibe8086299dd7e0652b8ec8694c1f4e5ad53d4dc6