Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox