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

* commit 'c07241cab3aa3f2fdc7b39a37861c22f245bd8f1':
  Document Toolbar's vertical alignment strategy