Merge "Fix testVisitUris_styleExtrasWithoutStyle" into main