Merge "Use NORMAL synchronous mode for WAL journal mode" into pi-dev