Merge "Fix control bar animation" into pi-car-dev am: b02a304c8b
am: a1cd8c5327

Change-Id: I2caae3663d7e485d59faff5d13ea28bc71758a35