Merge "Fixing issue where apps were not re-sorted after updating." into ub-launcher3-burnaby