Merge "Make LeadingMarginSpan2 behavior more consistent" into lmp-dev