am dde0123e: am 60ce6d45: Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev

* commit 'dde0123e6f30251cc3592c8fa4f711ff8052be09':
  Call Surface.destroy when Display is removed.