Backport patches for 1448771

Mozilla does not plan to backport the patches for 1448771 but we could to be on the safe side.

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