Merge "Fix wallpaper size changed to -1*-1 on first boot."