Merge "Set correct uid for headless system 0 in DnD PreferencesHelperTest" into sc-dev