Merge "reduce synchronization on SQLiteDatabase wherever possible"