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

* commit 'd6216b6aafbc3edb6288493d7cb36aaf2429fc19':