Merge "Fixing shortcut intent getting cleared during backup/restore" into sc-dev