Merge "Reload wallpaper after user unlock." into pi-dev