Merge "Optimize ResolveDataChangeEventsTask object allocation"