Merge "SnapdragonCamera: Shutter button was disabled after switching to video mode" into camera.lnx.1.0-dev.1.0