By "my keychain", I mean my login keychain. (My System keychain remains locked after I've unlocked my login keychain.)
I haven't got iCloud activated.
I'm leaving my hat hung on "bug", because it appears that Apple has actually been working on the problem.
Also, the ability to have different login and login keychain passwords is a pretty powerful and useful security feature, and I can't imagine Apple breaking it as part of a new security scheme. Well, on the other hand....
