Merge "Change layout span to match SpanLookup span" into nyc-support-24.1-dev