Bug 825121 - [Lockscreen] service provider shown wrongly when roaming
Merge pull request #7414 from Rik/roaming-825121

Bug 825121 - [Lockscreen] service provider shown wrongly when roaming, r=timdream, a=blocking-basecamp