Merge "Update control bar button slot size" into pi-car-dev
am: 80dc958877

Change-Id: Id6d5414b00c6b554bf00c0ac9ebda589233e7b42