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

Change-Id: I5d7794f462377b502e1d9384c4b9450a646fe5c4