Merge "API modifications for TaskStackBuilder" into jb-dev