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

* commit '8657bac9b55a8db9ce587ea896a03325968498ea':
  Guard against null default wallpaper