Merge "Changes Activity to use Dumpable for "legacy" cases."