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

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