Merge "SnapdragonCamera: fix setting menu bug" into camera.lnx.1.0-dev.1.0