Merge "APIs should not throw SQLiteException" into main