Bug 946652 - Merge LockScreen class into GaiaDevice class; r=zacc
Merge pull request #14815 from sashakruglov/bug946652

Bug 946652 - Merge LockScreen class into GaiaDevice class; r=zacc