Merge "Fix button clipping in minimized control bar" into pi-car-dev