Merge "Remove unused key uploadfromurl-queued"