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

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