Merge "Complete doDie() before executing addView()."