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

Change-Id: Ice17c3863bb91967201ee7ca77f5672b09236958