Merge "Camera: Allow finalizeOutputConfiguration not adding new surface"