Work with Mozilla to get updated patches into ESR45

We should try to squeeze as many patches into ESR45 as we can as this makes rebasing much easier for us.