am 33f09068: am ff1c3128: Finish issue #2271640: Fix wallpaper etc docs

Merge commit '33f09068720749f90dde029d6d17885d6a16994c'

* commit '33f09068720749f90dde029d6d17885d6a16994c':
  Finish issue #2271640: Fix wallpaper etc docs