Merge "Small refactoring to apps list." into ub-launcher3-burnaby