Merge "Adding new volume control dialog icons" into honeycomb