Merge "Revert "Fix bouncer race condition"" into rvc-dev