Same - I'd like to choose 1 or the other - not both or none.
Pretty sure I read that this is caused by having the pattern lock enabled when you do the update? Not everyone is experiencing this...
I suppose one option, is to revert to 2.1 via the .sbf, set it back to slider unlock only, re-root, hard reset, and re-upgrade.. ?
I'm pretty sure that'd fix it. Unfortunately, that's the only "sure thing" I've got for ya though.
**Edit: After some thought, I suppose if someone happened to know what the file/dir is that holds the security/lock config/info.. you might be able to get a file from someone that is working correctly, and do some in depth comparing... ? (Or flat out replace it?)...
I'm sure neither of these are what you wanted to hear.. BUT, if someone does happen to run across a solution, please post it for others that are having this issue!