am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev

* commit '39af5a78c073d01539625a9fbbb8511747e2f048':
  Don't set up external displays from binder thread