Merge "Fix wrong parameter for StaticLayoutPerfTest"