Merge "NoWritingToolsSpan" into main