Merge "Fix volume panel crashing"