So since it doesn't happen on 23563 and some others and I knew it started when the phone locked, I've replaced the lockscreen files in 21686 witht the ones from 23563 and all seems well. That seems to have fixed the issue
I'm going to throw up another 21686 here shortly with the Contact fix, hopefully, and the carrier name fix.
I'll put up a 23150 or 23152 later on today.