Merge "Fix the scan type of 2nd scan request for configuration of SCAN_TYPE_FULL_SERVICE"