Merge "Fix no-op RelayoutPerfTest" into main