Merge "Potential fix for end callback not being run in 3-button" into udc-dev