Merge "Shortcut Helper - Add "Default apps" shortcuts" into main