Merge "Camera: fix failures for depth/color camera combination" into pie-cts-dev