Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev