Merge "Resolve flaky audio routing CUJ tests" into main