Merge "Fix wallpaper placement + performance improvement"