Merge "Update namespace for Preference testutils" into main