Merge "Fix issue where keyguard adds widgets before the system is ready" into klp-dev