Merge "Keyboard shortcut helper A11y improvements." into main