Merge "Adds ShortcutManager#pushDynamicShortcut(ShortcutInfo)"