Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev