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

Change-Id: I83194220505d701d0586b28d327775df539cdc49