Merge "Fix drag flag logs" into main