Merge pull request #20609 from nullaus/bug1024397

bug 1024397 - Hide value selector when receiving 'activityclosing'. r=al...
(cherry picked from commit 5a53248d2404b6aa292c5d425f62c222e5cc1fd2)
Merge pull request #20651 from nullaus/v2.0

Merge pull request #20609 from nullaus/bug1024397