Merge "Remove key from database if download URL is not set" into rvc-qpr-dev