Merge "Fix NPE in WidgetPreviewLoader" into ub-now-nova