Merge "SnapdragonCamera: Replacing mono surface" into camera.lnx.1.0-dev.1.0