Merge "Controls UI - Icon updates, round 2" into rvc-dev am: a0caf8fad9 am: ec733dcca7 am: 6563102683 am: 315011dc92

Change-Id: I7740bc01fbba285373aa2ba40954eb0356fe84bf