Merge "Controls UI - Animated icons" into rvc-dev am: 2fa6c597b3 am: acae3f2bbb am: 619635e5b1 am: 49d1053b93

Change-Id: I6c97d1c39e67ddc717234c103c832634d79a935a