fix merged ActivityThread