Merge "Remove gadget special-case from preferences cleanup"