Merge "Fixing Wifi strings and pref ordering per ui"