Merge change 8216 into donut

* changes:
  Fixes #1994125. Ensures AbsListView's filter window is always dismissed.