Merge "Fix bug 3337711 - Volume panel layout adjustments" into honeycomb