Merge "Camera: Add diagnostic message for extractCameraIdListLocked exception" into main