Merge "Only wait for successful vibration" into udc-dev