Cherry pick from jb-dev

https://android-git.corp.google.com/g/185790
https://android-git.corp.google.com/g/185965
This makes sure the task stack is correct from the widget

Change-Id: I595139a1601777e559a322fa71a8a2efc12ae2a9
3 files changed