Merge "Re-use existing thread" into jb-mr1.1-dev