Merge "ShortcutManager: implement backup & restore" into nyc-dev