Merge "Database: Remove unused errorCount() method"