Merge "Let SpaBridgeActivity support ActivityEmbedding" into main