Merge pull request #9591 from crdlc/bug-868258

Bug 868258 - Followup to bug 860681 - Icons revert to default in 3rd par...(cherry picked from commit 1f05e95b6d4a562a15fd7f3812c31d8208138a8b)

Conflicts:
	apps/homescreen/js/grid.js
	apps/homescreen/test/unit/mock_grid_manager.js
	apps/homescreen/test/unit/mock_icon.js
Bug 870683 - Handle SCO