Merge "Controls UI - Animated icons" into rvc-dev am: 2fa6c597 am: 616f0b9d am: 7f60c1ac am: feefe4a6 Change-Id: Ia5bb61fd20e5f30b38c83c602a7a74386faf7284