Merge "Refactoring some logic in FolderPagedView" into ub-launcher3-burnaby