Merge "Code cleanup: removed NativeP2pDevice file and dependencies" into main