Merge "Fix trackpad check" into udc-qpr-dev