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

Change-Id: I817e5eac735935c9ac1c08a2b631e53ac28a98a1