Merge "Fix NPE in TaskView." into sc-dev