Bug 817821: Better update download event handling. r=etienne
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
Merge pull request #7388 from marshall/updateDownloadEvents

Bug 817821: Better update download event handling
Auto-merge from branch 'master'