Merge "Fix storage summary background colors." into oc-dev