multi boot - Windows 10 - Ubuntu: Windows bootmgr set to wrong partition

I am using Dell Inspiron 7560, dual booted with Windows 10 and Ubuntu. Windows is installed on a 128 GB SSD and Ubuntu is installed on a partition of a 1TB HDD. Each of the drives also have an EFI partition at their beginning for the respective operating systems. After a recent Windows update, which possibly has installed some patches for Boot Manager, the bootmgr variable has been set to the EFI of the HDD, rather than to the EFI of SSD, as it was earlier.

Before the Update, the options were:

1. Windows Boot Manager


2. Ubuntu

Now my UEFI boot has these options:

1. Windows Boot Manager ( wrongfully set to EFI of HDD)



2. UEFI: SK Hynix 128GB Partition 1 (SSD, Windows EFI bootmgr)

The Ubuntu (GRUB) option has somehow vanished.
The first boot option fails to boot Windows (rather brings up Dell Recovery), but the second one is working fine and boots into Windows.
I tried to change the device for bootmgr through BCDEdit on Windows, but it fails and the bootmgr goes back to the same wrong EFI partition.

Here are some additional facts that may help in diagnosis:

1. From a Ubuntu live installation, I saw that there were no Windows boot files on the HDD(Ubuntu) EFI and the Windows boot files on the Windows EFI partition also seemed to be intact.


2. After a recent repair, I had reinstalled Windows 10, which went into the HDD(default) and had then to be cloned to the SSD. I then installed Ubuntu on the HDD.


3. This is one of the first Windows update being done on my laptop, after being reset at the beginning of March 2019.

I suspect that Windows identifies the EFI partition of the lowest numbered Disk (Disk0=HDD) to be the Windows EFI partition during UPDATES. This possibly leads to creation of a new boot manager entry pointing to the Ubuntu EFI and a imaginary Path: EFI\Microsoft\boot\bootmgfw.efi with name "Windows Boot Manager", while the existing one is sidelined to be given the default name SK Hynix Partition 1.