Merge "Fix testWidgetsContainerFling" into ub-launcher3-edmonton