Merge "Specify the task affinity for ToneDialog"