Merge pull request #17607 from nullaus/bug981764

bug 981764
Conflicts:
	apps/system/js/homescreen_launcher.js
	apps/system/test/unit/homescreen_launcher_test.js

* removed 'stop' which shouldn't be part of this patch.