chore(runway): cherry-pick fix: cp-7.47.0 fix keyring controller remo…

chore(runway): cherry-pick fix: cp-7.47.0 fix keyring controller remo… #1185