Merge "Shortcut Helper - Fix it not showing on a secondary user" into main