Merge "SnapdragonCamera: The "x" of the scene mark is too large" into camera.lnx.1.0-dev.1.0