Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev