Merge change 5581 into donut

* changes:
  Add a null check in an AutoCompleteTextView callback to prevent a crash.