Merge "getPinnedShortcuts() shouldn't crash with shortcuts with..."