Here is the updated draft of the `window_scroll_functions_hook.diff`.  A copy of this same patch was attached to 22637 today, but I thought it should be included here also with the 22404.

Keith