Merge "Fix bug in userControlDisabledPackages on reboot" into udc-dev