Merge "Shortcut Helper - Don't interact with old version when new flag enabled" into main