Merge "Fix control bar animation" into pi-car-dev