Merge "Add PLATFORM_COMPAT_SERVICE to SystemServiceRegistry" into sc-dev