Merge "Camera: Disable surface usage caching for external surfaces" into main