Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev