Merge change 7619 into donut

* changes:
  Fixes #1861763. Prevents IllegalArgumentException in AbsListView on focus search.