am 8db45f0b: Merge "Avoid redundant wallpaper loading/drawing" into jb-mr1-dev

* commit '8db45f0bbf6d9b2fd5a1a884f6e2eaefad0a0b5e':
  Avoid redundant wallpaper loading/drawing