chore(runway): cherry-pick chore(4144): enable feature flag and fix u…

chore(runway): cherry-pick chore(4144): enable feature flag and fix u… #1235