Merge "Fix HandleScope with wrong thread error"