Merge "Fix wallpaper picker page TB issue" into ub-launcher3-master