Merge "Resolve race condition between @Before conditions" into ub-launcher3-master