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

Change-Id: Iefa9dfa9f9f8dc27ec2cd30081dbd20e24110fc3