Merge "Add @CriticalNative to getNativeTid to improve performance"