Bug 946139 - [LockScreen] Make lockscreen unlocking strategy customizable.
Merge pull request #14350 from snowmantw/issue946139

Bug 946139 - [LockScreen] Make lockscreen unlocking strategy customizable