Merge "Route volume commands whenever media stream is in use" into lmp-dev