am d6ff815f: am 216a9b17: am 03337715: am 1b495f52: Merge "Add default wallpaper to picker" into jb-ub-now-indigo-rose

* commit 'd6ff815f75f380063e793fbd5bfa94e86009f420':