Merge "Fixing crash in Wallpaper picker. (3392415)" into honeycomb