Merge pull request #13265 from mcjimenez/bug930544

Bug 930544 - Allow installing applications on several empty screens(cherry picked from commit 82e8266e56b8d7dc94832d2f94c7f4deef658c96)

Conflicts:
	apps/homescreen/js/grid.js
bug 930544 - v1.2 uplift
Merge remote-tracking branch 'mcjimenez/v1.2' into v1.2