am 8ae0420e: Merge "Fix issue #7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev

* commit '8ae0420e4b4169855608d404e389a66ce7253a36':
  Fix issue #7343200: Fails to show wallpaper in the background for...