[WIDGPT-57] Updated support for handling window-state specific JSPs.  Update based on code-review comments.