Merge "Fixes some issues for embedded Task" into sc-v2-dev