Merge "Fix button not clickable in sim confirm dialog" into udc-dev