am f3cad918: am db148b65: Merge "Fix memory leak and slowness in keyguard" into klp-dev

* commit 'f3cad9184f6ef56be403369d87fd0fa1cbd9de86':
  Fix memory leak and slowness in keyguard