Merge "Corresponding to new AAE multi-zone audio support"