Merge "Controls UI - Animated icons" into rvc-dev am: 2fa6c597b3 am: acae3f2bbb am: 619635e5b1

Change-Id: I5b2c2b35336fdec9ba65044656a24fde4976cb53