Merge "Keep the focus on the primary when launch ActivityEmbedding placeholder" into tm-dev