Merge "Update keyboard shortcut helper design spec." into main