Merge "Guard against null default wallpaper" into ub-now-lunchbox