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

Change-Id: I8f6cdf1039f4207e7591036acea6eb505ffc722d