Merge "Controls UI - Icon updates, round 2" into rvc-dev am: a0caf8fad9 am: 04bfe8f980 am: 0e43ce7ab2
Change-Id: I0568642fe84bf66af6eef1e5352352c817b83ff5
This commit is contained in: