Merge "Center overflow row buttons in control bar" into pi-car-dev
am: 090bbd8137

Change-Id: Ia92b47fcac881d729953fa888929fe21d079d8d2