Merge "Fix a couple trace issues" into ub-launcher3-master