Merge "Controls UI - Animated icons" into rvc-dev am: 2fa6c597b3 am: 616f0b9d51 am: 6764e607a6 am: 36800b33c2

Change-Id: I90672e402d583138ffa9fd5274136aaa095e0403