Merge "Fix TaskPositionerTests" into qt-dev