Merge "Fixing widget not laid-out properly in preview" into sc-v2-dev