Merge "Refactoring FlingToDelete" into ub-launcher3-master