Bug 1034183 - Disable lock screen also disables pass code lock
Merge pull request #21477 from timdream/settings-disable-lock-passcode

Bug 1034183 - Disable lock screen also disables pass code lock, r=arthurcc