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

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

Change-Id: Iacbb5c98508a1c52b009317095f6cff047080b90