am 07973bf2: Merge "Fixing nullpointer when creating new DB" into ub-launcher3-burnaby

* commit '07973bf2534c496c0febc93c7ef2a3bd6b33d6dd':
  Fixing nullpointer when creating new DB