Merge "keystore: Fix ID rotation window" into main