Merge "Improved re-enablement dialog text." into udc-dev