Merge "Apply restored wallpaper via API rather than rename-into-place" into nyc-dev am: bee2d3d
am: c1cb616

* commit 'c1cb61625ec2f0bf1019ccb89aa06b3fb865758a':
  Apply restored wallpaper via API rather than rename-into-place

Change-Id: I5cd7d8f152118c63c9ab62d6fc1b891c361044a5