Merge "SnapdragonCamera: Lock AE before taking snapshot" into camera.lnx.1.0-dev.1.0