Merge "Shortcut Helper cancel icon fixes." into main