Merge "Don't hide file size when display is embiggened." into oc-dev