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

* commit '152893dd66a8cdecab14595c20085a0f10917f21':
  Accept any restored wallpaper