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

Change-Id: I3e4abb55f30663ce7953c324ce8ad5220ed9a1c3