Merge "Fix issue where keyguard reports a valid token but doesn't draw" into klp-dev