Bug 1061563 - extent test timeout from 180000 for build-test
Bug 997606 - [NFC] Arrow truncate on shrinking UI
Merge pull request #23183 from crdlc/bug-1016228

Bug 1016228 - [Collections App] Rename Collections(cherry picked from commit 91edecd83e33b4704e5774e15e5b8b45c0f28d48)
Bug 1063487 - Fix Calendar oauth window. r=mmedeiros
Merge pull request #23909 from Cwiiis/bug1063487-2.1-backport

Bug 1063487 - Fix Calendar oauth window. r=mmedeiros
Bug 1061996 - [Camera] Switching between the Camera and Video buttons rapidly can disable them
Merge pull request #23891 from cctuan/997606-v2.1

Bug 997606 - [NFC] Arrow truncate on shrinking UI
Merge pull request #23876 from cctuan/1061563-v21

Bug 1061563 - extent test timeout from 180000 for build-test
Bug 1059434 - STK display text command doesn't support time duration
Bug 1059434 - STK display text command doesn't support time duration
Bug 1059100 - [email] Implement XOAUTH2 authentication support for gmail. r=asuth, r=jrburke, r=mcav

landing gelam https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/336 too