Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev am: fb52158e85
am: c9981e4d25

Change-Id: I5e87e1dfb5ee705f24afd330524255dede8b6c2d