Merge pull request #20791 from mnjul/bug_1027536_lockscreen_clock_stall

Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled. r=gweng
Conflicts:
	apps/system/js/lockscreen.js