Merge "Controls UI - Icon updates, round 2" into rvc-dev am: a0caf8fa am: ec733dcc am: 65631026 am: 315011dc Change-Id: I7740bc01fbba285373aa2ba40954eb0356fe84bf