Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev