Merge "Fix resetting of wallpaper offset." into pi-dev