Merge "Eliminate deferred surface destruction." into jb-dev