Merge "Camera: Extend HEIC output support" into main