Merge "Fix over-eager locking of volume dialog's primary stream."