Merge "[DO NOT MERGE] Fix BroadcastDispatcher registering with CURRENT" into rvc-dev