Merge "wifi: Enhance tombstone folder dumping behavior" into main