Merge "Be more tolerant in TaskStackBuilder" into jb-dev