Merge "Create task record with window container controller when adding task" into pi-dev
am: 6a505e2dab

Change-Id: I874f27b17523d45c38933a0fc3839ddf07d3554c