Merge "Make activities in untrusted embedding mode invisible behind overlay" into tm-dev