am 9bb7135c: am 69b5e38c: Merge "Use destroyDisplay()" into klp-dev

* commit '9bb7135c702f57f59f47253839fee81b983aa22e':
  Use destroyDisplay()