am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev

* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
  Tweak wallpaper restore acceptance heuristics