Merge changes from topic "am-982993aa-a6c9-4319-b060-3e573baba696" into ub-launcher3-edmonton-polish

* changes:
  [automerger] Fix testWidgetsContainerFling am: 68ac46da0c
  Fix testWidgetsContainerFling