Merge pull request #15920 from mcav/preview-lock

Bug 966023 - [B2G][Clock][Timer] Sounds previews continue to play from t...
Merge pull request #15921 from mcav/alarm-sizes

Bug 951080 - [Clock] Adjustment for setting a new or editing an alarm. r=hhuang
Merge pull request #15922 from mcav/stopwatch-button-sizes

Bug 951096 - [Clock] Adjust Stop/Lap buttons size and style in Stopwatch. r=jburke
Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. Followup. r=arcturus
Bug 965426 - FakeUpdateChecker fails on Tarako devices, r=jgriffin
Bug 968852 - Alarm check sign overlays the notification.
Bug 968957 - Disable 3rd party keyboards until we make them work with Nuwa processes r=me
Bug 966516 - [B2G][Calender]Changing the month in an event doesn't update to the number associated with that month
Merge pull request #16054 from rwood-moz/updatechecker

Bug 965426 - FakeUpdateChecker fails on Tarako devices, r=jgriffin
Update Gaia Read Me Integration Tests requirement with correct node version r=gaye
Merge pull request #16057 from punamdahiya/NodeVersion

Update Gaia Read Me Integration Tests requirement with correct node version r=gaye
Merge pull request #15957 from millermedeiros/966516-picker-bigger-month

Bug 966516 - [B2G][Calender]Changing the month in an event doesn't update to the number associated with that month r=gaye
Bug 907177 - [Clock] Add integration tests

r=gaye
Bug 960473 : Fix ReadNdef Issue when using Connect()
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
Bug 964927 [B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image - merge
Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
(cherry picked from commit e439f8630fdea790595efaebab24ec21be6bc0e4)

Conflicts:

	apps/camera/js/filmstrip.js
Bug 968996 - Bump gaiatest to 0.21.5, r=zac
Bug 964672 - Don't call Pair() before sendFile() r=evelyn