Merge pull request #9172 from xiupinglong/master

Bug 853756 - [Buri][WIFI]The icon display wrong after connected to AP(cherry picked from commit bc54b1482e32245ec5d8ff1316c77b6c1d968dc6)
Merge pull request #9181 from marcofreda527/master

Bug 845660 - [Call] Proximity sensor shouldn't work on speaker/BT SCO mode in call, r=@timdream(cherry picked from commit 70c13d2f583c6578037b0b65c47cd55f2ce1ce1c)
Merge pull request #9180 from jmcanterafonseca/fix_settings2

Bug 861843 - Intermittent issue: Contact Settings screen does not appear...(cherry picked from commit d10e892eb6887967803a68e8c441a7c456446437)
Merge pull request #9215 from etiennesegonzac/bug-850119-simple-fix

Bug 850119 - Prevent the callscreen from sliding inside the view if the(cherry picked from commit 3de103f3ae4a91dc44804a536e74bfbbd7a8f1fc)
Merge pull request #9193 from rwldrn/862061

Bug 862061 - [SMS][MMS] contacts without a phone number entry will break the SMS app r=julien(cherry picked from commit df823b637aabc4c7df28dc0ed3a09689e842da28)