Bug 851349 - Possible fix for intermittent failures. r=paul
Bug 841350 - Follow-up to fix 'this.updateCurrentBrowser is not a function'; r=me+bustage
Merge m-c to fx-team.