Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev