Merge "SnapdragonCamera: Changing ubifocus shutter sound" into camera.lnx.1.0-dev.1.0