Merge "Fixing regression when removing last item from folder." into ub-launcher3-burnaby-polish