Yesterday
merge from wallpaper_nre_fix