Merge "Allow organizer to handle transition for non-embedded activity" into sc-v2-dev