Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev