Fixed a scriptland state issue that manifested especially badly on proxies.
Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fixed a scriptland state issue that manifested especially badly on proxies.