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

Change-Id: I3c78bea15f4d737f1945b62f3d205135d6cf4cf1