Merge changes I4bb716a5,I11f2507f,Idfb46e62 into main

* changes:
  Remove serialNumber parameter from prepareUserStorage
  Remove serialNumber parameter from createUserStorageKeys
  Remove serialNumber parameter from unlockCeStorage