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

Change-Id: I7ed4604a24774f802a764e787122c3339befda5b