Merge "Use Locale default temperature unit in wallpaper picker" into udc-dev