Merge pull request #23756 from mancas/bug1031374

Bug 1031374 - Overlay for Marketplace does not cancel when tapping home. r=etinenne
(cherry picked from commit 64fb49f3cd0b78ea0491acbc75b71c5ec988bd16)
Merge pull request #24935 from RudyLu/winMgr/bug1077609

Bug 1077609 - [Keyboard] When app permissions page asks user to add
r=timdream.
(cherry picked from commit ff81566d0f19741e67c0c3b1152a72022270110a)
Merge pull request #25132 from RudyLu/ime/Bug1077609_uplift_v2.1

Bug 1077609 - uplift to v2.1.