Merge "Remove feature flag slice injection" into qt-dev