Merge changes from topic "refactor_mix"

* changes:
  Validate consistency of audio mix criteria during registration
  Refactor mixCriteria in AudioPolicyMix.