Merge "Ensure adapter is not null in AutoCompleteTextView"