Bug 1030448 - Also make the default lockscreen react to the 'lockscreen....

...lock-immediately' setting.
nit: please add some message here to explain why the assertion should be true:

"it didn\'t lock after the lock-immediately setting got changed"