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 #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 remote-tracking branch 'origin/v1.0.1' into v1.0.1