Merge "Only call layout during layout pass" into sc-v2-dev