Merge "Fix volume dialog ringer icon size."