Merge "Ensure volume preference has correct defStyleAttr"