am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev

* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
  Avoid memory leak by only registering callback while attached to window.