Merge "Fix KeyguardService constructor indentation." into main