Merge "Camera: fix legacy shim jpeg thumbnail size break" into mnc-dev