am 9e91b7d5: Merge "Don\'t crash if WallpaperCropActivity isn\'t passed a URI" into jb-ub-now-indigo-rose

* commit '9e91b7d5fccebc454424657e62497016ebdc7d1e':
  Don't crash if WallpaperCropActivity isn't passed a URI