Merge "matrix: camera HAL uses [^/]+/[0-9]+ instance." into pi-dev