Merge "Fix bug in TaskStackBuilder#addParentStack" into jb-dev