Merge "Don't rely on intent to call back from activity tracker" into sc-dev