Merge "Camera: Correct the U/V plane selection for HEIC streams" into main