Merge "Fix last bit of WidgetTray jank issue b/21133230" into ub-launcher3-burnaby