Merge "Don't send split info callback before activity is created" into tm-dev