Merge "Fix comment typos in keyguard repos" into main