Today
merge from wallpaper_fixes