Merge "Stop scanning after errors" into froyo