backport 1334776

We'd like to backport Mozilla's 1334776

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