Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev...
Merge "Fixed that the screen could lock when launching camera" into oc-dr1-dev am: fb52158e am: 73156237
am: 1f29ea46
Change-Id: I48a67b2b5b0e68cb738ef358388eba9da05c66d2