Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev