Merge "Fix TouchExplorerTest flakiness." into main