Merge "Pass token to ActivityStack and SplitInfo"