Merge "Unhide getOrCreateThreadId"