Merge "SnapdragonCamera: Change the default maker for panorama" into camera.lnx.1.0-dev.1.0