Merge "Correctly handle disabled list items in AutoCompleteTextView. Bug #2516659"