Merge "Don't show external presentation until keyguard actually shows" into klp-dev