Bug 819593 - Keyboard flickers close then open when tapping from one input element to another r=vivien
(cherry picked from commit a91b91bf5ca82b8c78cc1e40bc5650708f29cc48)
Merge pull request #9358 from lodr/bug-864798-change-mnc-mcc-with-strings

Bug 864798 - Follow up of bug 845629 about updating MNC and MCC uses
Cause r+(cherry picked from commit 4461830f907e8f87ff13ddb31aabec4726530306)
Merge pull request #9345 from lodr/bug-864269-reset-low-balance-notification

Bug 864269 - Resetting notification each time the user changes the threshold
Cause r+(cherry picked from commit a49fc93f3d36c34b167a57d1da319ed5e9d0086f)
Merge pull request #9420 from albertopq/contacts-bug-only-org

Bug 864841 - Creating a contact with only "Company" doesn't work r=arcturus(cherry picked from commit e465d99917b72e16e4f6b4f1e7fdce7b84b152f9)
Bug 835193 - sleep time for preview of images and videos from filmstrip. r=daleharvey

updated code as per coding standards
updated as per naming convention
(cherry picked from commit a24785ad5efd220d14bfda8b4c6a48cb5d8a2e38)
Merge pull request #9418 from jlebar/sms-keep-alive

Bug 865429 - Hold the high-priority wake lock before showing the new-SMS...(cherry picked from commit c6b17d0000c43f7bdf3f46f96a4e9af3bc16c0d8)
Merge pull request #9160 from mcirlanaru/bug_849718

Bug 849718 - Don't prompt for SIM PIN when opening lock screen camera, r=@timdream(cherry picked from commit f476a60daa5fc46e5b9caee2e021fc2b5b582eae)

Conflicts:

	apps/system/js/lockscreen.js