Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database."