Merge "cameraserver: Fix DYNAMIC_DEPTH / HEIC keys selected for UHR stream configurations." into udc-dev