Merge "Fix ANR at work's wait() in ThreadPool"