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

Change-Id: Ide4850b02464f875a596257fa19f18fc9d336b62