Merge "update isCrossSimCallingEnabledByUser name" into sc-dev