Merge "Fixing nullpointer when creating new DB" into ub-launcher3-burnaby