Merge "Only provide the resolved activity info to the global intercept window" into sc-dev