Merge "Fix touch target for Don't allow button" into udc-dev