Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main