Merge "Correct the disable button text" into udc-dev