Merge pull request #14241 from mcjimenez/bug944495

Bug 944495 - Race condition when installing single variant apps(cherry picked from commit 573304f58bb431c3622a86786b5e17aaa65b07b9)

Conflicts:

	apps/homescreen/js/configurator.js
	apps/homescreen/js/grid.js
Merge pull request #14456 from mcjimenez/bug944495_12

Merge pull request #14241 from mcjimenez/bug944495. Rebased for v1.2