Merge "Test that activityId is passed in the intent." into main