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

Change-Id: Id54734a295876fa7f88daa291e7d0e3c9cbfab3a