Merge "When finishing a heavy weight process, finish the activities in it."