Merge pull request #11806 from crdlc/bug-896873

Bug 896873 - [B2G][Helix][Icon]After upgrade the OS, all of the icons are grey(cherry picked from commit e217f6e01d424be2d5b31bd5fcf53bc7915a40a2)

Conflicts:
	apps/homescreen/js/page.js
	apps/homescreen/test/unit/page_test.js