Merge "Embedded Activities in TaskFragments" into sc-v2-dev