Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev