Merge "Back up wallpapers via staged copies, not hard links" into nyc-mr1-dev