Merge "Make photos/videos storage preference normal." into oc-mr1-dev