Merge "database: rename clearSnapshot() => flushSnapshot()"