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

* commit '5e3ab35c0aaadcec496d18d1a66e79c35a7f8ffd':
  Fix memory leak and slowness in keyguard