Merge "Fix null executor in TaskView with bubbles"