Bug 1030448 - Also make the default lockscreen react to the 'lockscreen.lock-immediately' setting.
Merge pull request #21247 from guilherme-pg/bug1030448-bad-lockscreen

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