Merge "camera: make exception handling more explicit in camera2 classes" into main