Merge "Limiting activity embedding to the activities of the same app" into sc-v2-dev