Merge "Issue 3371080: fix volume update in mute state." into honeycomb