Merge "Fix ActivityEmbedding placeholder launching above fullscreen activity" into tm-qpr-dev