Merge "Align shortcut helper components to spec" into main