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

Change-Id: I5317b45d92e7d74f3d0d94b2fba0b35156ec8ded