Merge "Remove unused keyguard code"