Tidy up stale lock wallpaper state in set-both operation

Also fix bug that was failing to remember the lock-only wallpaper, and
along the way make the disk write a single large block operation instead
of a number of small writes.

Bug 27353079

Change-Id: Ib1351e509af95905dced41e69c6e13dcce839511