Merge "audio policy: reduce mute time when invalidating tracks" into pi-dev