Merge "Fix bug 3413800 - Revise AutoCompleteTextView dropdown behavior"