Merge "Fix synchronization issue in ArrayAdapter External bug #19235"