am 49cdb1b1: A little wallpaper cleanup.

Merge commit '49cdb1b18c12a81cac9817c4800e43d5b507e0c4'

* commit '49cdb1b18c12a81cac9817c4800e43d5b507e0c4':
  A little wallpaper cleanup.