Merge pull request #14649 from fcampo/sms-overlay-style-broken-947285

Bug 947285 - [Messaging] Notice style is broken (r=julienw)
(cherry picked from commit 49cb38d06740e6b49ff30e89e11f428386250329)
Merge pull request #14609 from arroway/bug-831948

Bug 831948 - WiFi Tethering should default to WPA2
(cherry picked from commit 47266e33ea9f48c61c6cc8697999ede8477fe20e)
Merge pull request #14803 from mcjimenez/bug951552

Bug 951552 - Incorrect behavior when first boot is run with a pin locked SIM (and no PIN is entered)
(cherry picked from commit 5e5c9f71911e2c83c2552273b3407ab4ea60e56c)