Merge "Merge "ActivityEmbedding: launch into the same side container" into sc-v2-dev am: 53c2f64d" into sc-v2-dev-plus-aosp