Merge "SnapdragonCamera: Change the default sharpness control is 2" into camera-SnapdragonCamera.lnx.2.0