Merge "Do not consider embedded task as task switch" into sc-v2-dev