Merge "Shortcut Helper - Only start Activity after shortcuts have been fetched" into main