Merge "Add trunk stable flag for audio product strategies multi-zone support" into main