Merge "Guarantee that db, shm and wal files are deleted together."