Merge "Update the order of the tabs." into ub-launcher3-master