Merge "Close Folder when opening WidgetsBottomSheet" into ub-launcher3-dorval
am: 2bb1e74ccf

Change-Id: I6442f823d6c276add4ddb2275c5ed20aad8b29e4