Merge "Fix activity relaunch issue with ActivityEmbedding" into tm-qpr-dev