Merge "Show current app name shortcut helper" into main