Merge "Use already-running app instances when splitting" into tm-qpr-dev