Revert "Merge pull request #15897 from snowmantw/issue960901-instantiable-lockscreen"

This reverts commit efba9babeedbb0c9af9b7cb91a5630d7be2f5d8d, reversing
changes made to 8ac5dc6b76709e742cb923c58d1f4b415b3e08fb.

Conflicts:
	apps/system/js/storage.js
Revert "Merge pull request #16261 from dmarcos/bug960611+bug958200"

This reverts commit 3d01dbcfe42d6f57c794855b8c4bcc462e4e38d1, reversing
changes made to c83c1807de0182ee7e5cbdc9d5bdc7e4a5f6e08d.