Merge "Fix button clipping in minimized control bar" into pi-car-dev
am: 53da1037a7

Change-Id: I6f61817068fc337405260014c6fc3d1221590915