Merge "Update ActivityEmbedding Property Javadoc"