Merge "Camera: Don't limit the camera provider types" into pi-dev