Merge "Don't call onQueryTextChanged more often than necessary."