Merge "Add feature flag for audio output switcher." into pi-dev