Merge pull request #26598 from nullaus/bug1100714

Bug1100714
(cherry picked from commit 81580722b6f7e576a11e7973c0899cd55bd2f24c)

Conflicts:
	apps/system/test/unit/app_chrome_test.js
Merge pull request #26640 from nullaus/v2.1

Merge pull request #26598 from nullaus/bug1100714