[CDF-274] Regression of focus window state restoration, upon chart re-render.

@pamval please review.