Merge "Fix keyguard authentication after PIN" into sc-v2-dev