Merge "Remove test restrictions" into ub-launcher3-master