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

Change-Id: I13769b623271127d79829799e2b62fc2def7b3aa