Merge "Better diagnosing leaked activities." into sc-dev