Merge "Guard against name == null in ShortDump"