Merge "Avoid unnecessary allocation in HandwritingInitiator" into udc-qpr-dev