Merge "Ignore PSDS download request if download is in progress" into main