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

* commit 'a4738bdbd2d310842bc55aecfcd5105ade83e146':
  Fix issue where keyguard reports a valid token but doesn't draw