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