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

Change-Id: If6d1b5f630004bce3f8a56e1591d7ede47b53403