Merge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev