Merge "Correct activity's lifecycle when the process was killed in background." into 24D1-dev