Funny... I was just working on this problem too.
Seems like after I changed the settings on the dim control everything was fine again so I ignored it. I changed mine to 1Min full, 1Min dim, and lock on screen off. Verified it was dimming and auto locking properly.