Merge change I7d40ad9a into eclair

* changes:
  More on issue #2271640: Fix wallpaper etc docs