Merge "Improve test isolation in AbstractLauncherUiTests" into main