Merge "Revert "Made LCStoreDB try to use a separate DB connection""