Merge "ShellSubscriber: Avoid rollover bug" into rvc-dev