Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code. r=Alive
Bug 1019156 - E.me history bar
Bug 988768 - [Sora][Message][MMS] Can't send messages with an attachment between 295 and 299KB r=schung

This changes the default setting in Gaia from 300KB to 295KB. This also
substracts 5KB from the setting taken in Gecko.

(cherry picked from commit f250750c9b8381560fa33b2383737736e4dbdff5)

Conflicts:
	apps/sms/js/settings.js
	apps/sms/test/unit/mock_settings.js
	apps/sms/test/unit/settings_test.js
Merge pull request #20409 from weigao123/bug980217-v1.3t

Bug 980217 - (v1.3t) Make "Skip" and "OK" buttons show when entering SIM 2 PIN code. r=alive
Merge pull request #21381 from julienw/988768-v1.3t-smaller-setting-for-size-limitation

Bug 988768 - [Sora][Message][MMS] Can't send messages with an attachment...
Merge pull request #20072 from shamenchens/Bug1019156-E.me-History-2

Bug 1019156 e.me search history, r=ehung