Merge "Prevent Sysui crash when user is deleted." into udc-qpr-dev