am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid...
am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev
* commit '7c95ae91':
Fix issue where keyguard reports a valid token but doesn't draw