Merge "Shortcut helper now shows correct application launch shortcuts." into main