Merge "Clear user-set info when package gets its data cleared" into sc-dev