Merge "Introduce ShortcutManagerThrottlingPreferenceCtrl"