I had this same problem but I fixed it like this:

When it says password did not unlock wallet, make a new wallet (give it a different cloud backup location), after going into the new wallet for the first time, click exit/switch and select your original wallet. Password should work now.

Edit: Whoops, jumped the gun a bit. I didn't have the same issue as the OP, but I had the 'Password did not unlock wallet' bug.