am 9e19ea28: am 7534707b: Merge "Ensure wallpaper creation succeeds" into jb-mr2-dev

* commit '9e19ea284a4061d49876697ad8b285b4202c9573':
  Ensure wallpaper creation succeeds