Merge "If device config has a NAS related message, also enable importance adjustments" into qt-qpr1-dev