Merge "Add feature flag to enable skip direction mapping" into qt-r1-dev