Merge "Remove sleep in test app." into udc-dev