Merge "Fix wallpaper screenshot" into pi-dev