Merge "reduce locking when using SQLiteStatement"