Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev