Merge "Adding a flag for enabling a new oneway API for triggering haptics in the UI thread" into udc-qpr-dev