Merge branch 'main' into word-wrapping

63ec67c2c324c1ef335a4cc1e85b9abdf5117108

Tucker McKnight <tmcknight@instructure.com> | Sun Jun 21 2026

Merge branch 'main' into word-wrapping