Merge "Support persistent/transient asset variants in EDU tooltip." into tm-qpr-dev