Merge changes from topic 'am-9a7ba235-25ac-4285-940b-8903da339a98' into ub-launcher3-master

* changes:
  Close Folder when opening WidgetsBottomSheet am: 8897b4167e
  Close Folder when opening WidgetsBottomSheet