Merge "Add multi-client support in camera2" into main