Merge "Put starting surface in task for embedded activity" into sc-v2-dev