Merge "Allow embedding activities cross apps" into sc-v2-dev