Merge "Deflake ExternalStylusIntegrationTest test case" into main