Bug 821582 - [Settings][Call Settings] All the keyboard for forwarding phone number is wrong.
Bug 823783 - Handle various combinations of settings events and wifi events more correctly.
Merge pull request #7330 from jaoo/821582

Bug 821582 - [Settings][Call Settings] All the keyboard for forwarding p...
Merge pull request #7435 from mrbkap/823783-settings-tethering-wifi

Bug 823783 - Handle various combinations of settings events and wifi events more correctly, r=kaze
Auto-merge from branch 'master'