Merge "Disabling failing test" into ub-launcher3-master