Merge pull request #9564 from xiupinglong/master

Bug 861097 - [Buri][Beetle lite FF]The phone display date on status after power off animate  r=Alive(cherry picked from commit 74e702aa11ab85d15ddf9ca783de76e8dc498b14)
Merge pull request #9628 from mozsquib/email-fix-account-creation

Bug 870042 - Impossible to create more than one e-mail account(cherry picked from commit 76ee46e0d4a05b3e7624994f439391a3a4572944)
Merge pull request #9711 from huchengtw-moz/settings/Bug_868908_Layout_is_nok_on_german

Bug 868908 - [Buri][Translation][NITZ] Lay out is NOK on German.(cherry picked from commit 49a00e9a975b9b005cfbfe1dfea852cc154c4343)
Bug 869859 - [Video] support mimetype of video/ogg for all web activities r=dkuo
(cherry picked from commit c0213ef9920a247cd61db129018a492a605d0b61)
Merge pull request #9689 from davidflanagan/bug828237

Bug 828237 - changing language should also switch default keyboard r=@davidflanagan,@RudyLu(cherry picked from commit a1cf4de967a4a8231c4dfd34d5da118047100b31)

Conflicts:

	apps/keyboard/js/keyboard.js
Merge pull request #9801 from davidflanagan/bug828237-v1-train

Merge pull request #9689 from davidflanagan/bug828237
Merge pull request #9532 from bakulf/wakelock

    Bug 859824 - [AudioChannel/Music App] Music App Didn't Release Wakelock When paused by AudioChannel, r=@dominickuo(cherry picked from commit 00e8ded6c27b79570020bc1add0cf6c0c6413450)
Merge pull request #9542 from rnowm/banner-update

Bug 868391 - [Building Blocks] Alerts should be updated(cherry picked from commit 8513e27db3232a71a2e3eec90c8985930cd48540)

Conflicts:

	shared/style/status.css
Bug 849365 - Change the input size to 16 and the input type to text.