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

* commit 'ae456fd894c5a41f859196016a7c49113b235eda':
  Accept any restored wallpaper