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