Merge "Refactoring wallpaper picker activity" into ub-launcher3-master