Merge "Use destroyDisplay()" into klp-dev