Merge pull request #17303 from nullaus/bug982006

bug 982006(cherry picked from commit 288c8763265aa98c16c8b79cddaf37c3dd34d2a2)

Conflicts:
	apps/system/test/unit/app_modal_dialog_test.js
Merge pull request #17987 from nullaus/v1.4

Merge pull request #17303 from nullaus/bug982006