Merge "Revert "Distinguish warm/hot launch by whether the activity has attached process""