Merge "Fix TV volume dialog" into sc-dev