Merge "Adjust the condition for scanning in MRService" into sc-dev