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

Change-Id: I2be828957b2019861533b9513457a05168e62228