Merge "Lazily reinflate volume dialog after config change"