Merge "Fix ShellSubscriber concurrency issues" into rvc-dev