Merge "Reattributing disabled tests to a more relevant bug" into ub-launcher3-master