Merge "Camera: Don't override extension surface native format" into sc-dev