Merge pull request #24454 from nullaus/bug1069452

bug 1069452 - Never take screenshot of closing AppWindow if part of home...
(cherry picked from commit 2834baf4c7e34fe6ef335f0469f6d0f593c5922b)

Conflicts:
	apps/system/test/unit/callscreen_window_test.js

Manually resolved, this test does not exist in 2.0 because the callscreen
does not have it's own window type.