Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev