Merge "Make sure primary audio zone has highest priority" into qt-dev