Merge "Camera: Various Camera2 extension updates" into sc-dev