Re-land Masonry cleanup
Pull request: https://github.com/WebKit/WebKit/pull/7496
Committed 257799@main (9420329177e4): <https://commits.webkit.org/257799@main> Reviewed commits have been landed. Closing PR #7496 and removing active labels.
<rdar://problem/103307895>