Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev