Merge "Merge "Add feature flag to enable skip direction mapping" into qt-r1-dev am: 79f7ac9922" into qt-r1-dev-plus-aosp