Merge pull request #21246 from nullaus/bug1013509

bug 1013509 - Dismiss Permission Request when requesting app is terminat...
(cherry picked from commit 1ba15ce1ae7254badd25fd276556c1b4f36c0a45)
Merge pull request #21307 from nullaus/v2.0

Merge pull request #21246 from nullaus/bug1013509