Merge "Correcting type of DatabaseSqlite::insertId()"