Merge "Polish ActivityEmbedding enter/exit PiP (1/n)" into tm-qpr-dev