Merge "Fix a deadlock between thread flip and suspend request."