Merge "Add API to suppress using stable IDs for Pref Adapter" into mnc-ub-dev