Merge "Camera: Bump camera splitter output slots" into pi-dev