Merge "Ensure that TaskView callbacks are made on the ui thread for the view" into main