Merge "Add TaskPositioningController"