Merge "Accept any restored wallpaper" into lmp-dev