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: c9981e4d
am: 8db71368
Change-Id: Ib8243dfc97a71956c0c1dfc8b845d57bde9dc6e9