Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb