Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev