Merge "Add new attributes for widget sizing controls." into sc-dev