Merge "Deflake tests due to real UserBroadcastDispatcher" into rvc-dev