Merge remote-tracking branch 'mozilla/fix-battery'