Merge "Persist Theme name instead of ID for ShortcutInfo" into sc-dev