Merge "Fix ShellSubscriber concurrency issues" into rvc-dev am: ca7fc3be0f

Change-Id: Ice87cb036950c9f31abedbfd101ed19be182c4e8