Merge "DO NOT MERGE: Add a recycle map for preference IDs" into mnc-ub-dev