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

Change-Id: I6e2ad8a2805a1206293be50a9dd251c05c35744c