Merge "Add null checks for split layout before dumping" into main