am 2cf6f5df: Merge change 5238 into donut

Merge commit '2cf6f5df59d466a729cc10b7688e17cd548a2fda'

* commit '2cf6f5df59d466a729cc10b7688e17cd548a2fda':
  Fix the weird anchoring of the search dropdown when pivoting into an