Merge "Add device profile dump flag guarding for OneGrid" into main