Merge "Eliminate gap between finalize() and destroy()" into jb-dev