Merge "Add a flag to turn on theme picker in wallpaper picker" into ub-launcher3-master