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

Change-Id: I362d1f332cdc241840f2f8d58021117881dac050