Merge "WatchedItemStore add db connection helper methods"