Merge "Disable failing test testConfigCancelled" into ub-launcher3-master