Merge "Use normal layout for "Space Used" header." into oc-dr1-dev