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

* commit '86ee1473fbb53e4fa75b284711ae08cc798c73c9':