Merge "Fix NPE in PlatformCompat" into main