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

* commit 'bbb1aea148270947cef90fe1c8d0ad5961ef392e':
  Fixing regression when removing last item from folder.