Merge "Fix bug where buffer slots to clear were not set correctly" into udc-dev