Merge "Fix race condition in fallback key processing."