Merge "Fix mocked HighPriorityProvider calls in test" into rvc-dev