Merge "Revert "Fix issue with Shell listeners being unbound if SysUI is restarted"" into sc-v2-dev