73e9b1a124
Residual hunk from PR #84832's picker-rebind commit; the functional surfaces.tsx change landed on main via #86250. (cherry picked from commit 990936d6f6e752ddb474787c1f7fdc3ad4f4dc60, docstring hunk only)