Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev