Merge "Fix widget cell container size" into sc-v2-dev