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

Change-Id: I48a67b2b5b0e68cb738ef358388eba9da05c66d2