Merge "SnapdragonCamera:Fix The setting list and picture size aren't same as spec" into camera.lnx.1.0-dev.1.0