Merge "Rename the SQLite flag" into main