Merge "Remove dupe key in UniquePreferenceTest" into pi-dev