Adjust toolbar group margins for equal vertical alignment

Change-Id: I4596e50c941b1cb628f2ccba983d4b60b7939174
Merge "Adjust toolbar group margins for equal vertical alignment"