Merge "Migrate the usage of sCompatibilityModeEnabled" into sc-dev