Merge "Fixing issue where items that were not yet added were not removed from the db. (Bug 6428418)" into jb-dev