Merge "Fix memory leak and slowness in keyguard" into klp-dev