Merge "Fix scrolling bug in AutoCompleteTextView. Bug #2495033"