Merge "Add TaskManager API" into jb-mr2-dev