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

* commit 'cb6f35f9a35d622a791109482a6b967560124933':
  Avoid redundant wallpaper loading/drawing