Merge pull request #24454 from nullaus/bug1069452

bug 1069452 - Never take screenshot of closing AppWindow if part of home...
(cherry picked from commit 2834baf4c7e34fe6ef335f0469f6d0f593c5922b)
Merge pull request #24582 from nullaus/v2.1

Merge pull request #24454 from nullaus/bug1069452