Merge "Hook EmbeddedActivityWindowInfo APIs to ClientTransactionListener" into main