Merge "Fix b/276423111: Keep unchanged perferences in the app list instead of clear all." into udc-dev