Merge "Tidy up stale lock wallpaper state in set-both operation" into nyc-dev