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