Adjust controlbar icon alignment am: a15882f816
am: 2527122b3d

Change-Id: Ia09be64a09956c3b94abd76d8357a62db9f534c2