* commit 'c255033f0a4b55f8d4279a9a5b283ed742a5e642': Make LeadingMarginSpan2 behavior more consistent