Backport patches for bug 1469916

I got notified that we want to backport the patches that fixed Mozilla's 1469916. We should do it and test the result in an alpha release.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information