Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev