Merge "Apply restored wallpaper via API rather than rename-into-place" into nyc-dev