am 05110234: Merge "Document Toolbar\'s vertical alignment strategy" into lmp-mr1-dev

* commit '0511023432ff24c5ddda563e326273936b5d40f5':
  Document Toolbar's vertical alignment strategy