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

Change-Id: I1b484b195abab99e194a665102ca5ac2cf85bf4c