Merge "Vertically align toolbar child views with similar gravities" into lmp-dev