Merge "Update keyboard shortcut helper strings." into main