Merge "Correctly log buffer unfreeze events" into udc-dev