Merge "Create task record with window container controller when adding task" into pi-dev