Merge "Reduce handwritingSlop to 2dp" into udc-qpr-dev