Merge "CameraProvider: Refactor legacy name regex code" into oc-dev