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

Change-Id: I4c1e4615b9dd5ad03666ab7f8e7812e07fa4b48a