Merge "Return null from getWidgetPreview instead of throwing error" into main