am 8d60f408: Merge "Fixing crash in Wallpaper picker. (3392415)" into honeycomb

* commit '8d60f408802624b35f61d5e068bd13beede7b345':
  Fixing crash in Wallpaper picker. (3392415)