am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev

* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
  Accept any restored wallpaper