am db6f304d: am 8657bac9: Merge "Guard against null default wallpaper" into ub-now-lunchbox

* commit 'db6f304d6bc6a93a30b7b6f7ae4339f719c84797':
  Guard against null default wallpaper