am 8d1e86d0: am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev

* commit '8d1e86d054c9d2a9bdec2a0c9d454ddf21768031':
  Don't show external presentation until keyguard actually shows