Further adventures in vertical alignment.
Further further adventures in vertical alignment.
Merge bug 25606 into bug 25600.