Merge "Controls UI - Animated icons" into rvc-dev am: 2fa6c597 am: 616f0b9d am: 6764e607 am: 36800b33 Change-Id: I90672e402d583138ffa9fd5274136aaa095e0403