Merge "SnapdragonCamera: ZSL and manual 3A can be on at same time" into camera.lnx.1.0-dev.1.0