Activity class persistent; fixed deps