Merge "Camera: Avoid Metadata re-allocation during shrinkCaptureResult" into pi-dev