Merge "Show widget previews in their expected cell sizes" into sc-dev