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

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