[PATCH] Keys: Fix key serial number collision handling