Merge "Fix uninstall button can't click problem" into udc-dev