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

Change-Id: I10f3cf1a4ed90de48521e8ef5f2c4506489c783f