Merge "Shortcut Helper - Implement UI for shortcut details" into main