Merge "Fix nondismissing vol dialog after config change"