Merge "Fix issues with reentrant SQLite triggers."