Merge "audio policy: remove glitch when registering dynamic policies"