Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev