am 9026ce17: am 58705534: am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf

* commit '9026ce177afb710d753020931a942665a0ce7f81':
  Fixing regression in drop target bar height. (Bug 11980757)