Merge "Add debug logging when keys are blocked"