Merge "Add "Reset ShortcutManager throttling" to dev options" into nyc-dev