Merge "Camera: Make finalizeOutputConfigurations more resilient" into oc-dev