Merge "Revert "Add interval for relayout perf test"" into sc-v2-dev