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