Merge "Handwriting delegate API changes" into udc-dev