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 #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)