Merge "Moving a few testing classes to a separate package" into ub-launcher3-master