Merge "Camera: Update crop info in onHeicFormatChanged"