Merge "Fix ActivityEmbedding issues with REORDER_TO_FRONT" into tm-qpr-dev