Merge "Increase stylus data timeout."