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

Change-Id: I12fde75aef59672a45fb5f24775e2a45c89b40e7