Merge "Fix NPE in RunningTasks#getTasks" into tm-dev