Merge "Prevent AutoCompleteTextView from opening a popup when it shouldn't Bug #5553515"