Merge "SnapdragonCamera: Keep screen on when recording the video" into camera.lnx.1.0-dev.1.0