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