Merge "Repeat proxy limit callbacks if we keep going above the limit." into sc-qpr1-dev