Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev