Merge "Always clear password reset token when removing device owner" into udc-dev