Merge "Shortcut Helper - Connect UI layer to shortcuts" into main