Merge pull request #20249 from TheoChevalier/patch-3

Bug 1017918 - Add mai (Maithili) to Gaia languages
Revert "Bug 1020685: Close only over the URL string that we need. r=bfrancis"

This reverts commit dfa599e45b6da54439374d1983fc10d21d9ebf54.
Merge pull request #20283 from allstarschh/Bug1021213

Bug 1021213 - [B2G][NFC] The browser will remain in landscape mode after bumping with another NFC phone. r=alive