Merge "Explicitly log portal detections" into main