Merge "Update taskAffinity" into qt-dev