Merge "Fix volume panel hang"