Merge pull request #23874 from nullaus/bug1044125

bug 1044125 - Only capture screenshot and show overlay when edge gesture...
(cherry picked from commit 1503e1f9f7846a3813c057ce95c35ac22031027f)
Merge pull request #24149 from nullaus/v2.1

Merge pull request #23874 from nullaus/bug1044125 a=fabrice