Merge changes I07ffc243,I1151746c,I295cf055

* changes:
  Add volume dialog icons specific for tv
  Update volume control ui for tv
  Show volume number in volume control ui