Merge "Change config.xml handwrtiingSlop to 2dp" into udc-qpr-dev