Merge pull request #9479 from vingtetun/836056

Bug 836056 - [Lockscreen] Lockscreen appears after reboot after settings...(cherry picked from commit f8658bd0714cea8a37eeb4a4f670932c6bf355ad)

Conflicts:
	apps/system/js/lockscreen.js