Merge "Remove buttonGravity Toolbar attr" into lmp-mr1-dev