Merge "Fix preference puts with "null" values."