Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev