Merge "Move activity starting logic into new ActivityContext extension." into tm-dev