Merge changes I127f0891,I7827c622

* changes:
  Remove change of tint on volume dialog hide on TV
  Adjust volume ui on TV