Merge "Don't change task type for launcher activities."