Merge "Don't back off for first few system stops." into udc-dev