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