Merge "ActivityEmbedding: launch into the same side container"