Merge "Try CS preferred scan if EXTENDED_SERVICE_REQUEST failed" into main