am 27f03251: Merge "Deleting empty folders based on DB state" into ub-launcher3-burnaby

* commit '27f03251ea8b563dc385094e8d03f9fc1dc9390d':
  Deleting empty folders based on DB state