Merge "Avoid crash when widget previews have no intrinsic size"
am: f51b706439

Change-Id: I801969e037a0f8e41c536b695a3acb67d4e1f599