Merge "Apply correct realActivity for TaskBuilder"