Merge "Reset wallpaper state during startup" into pi-dev