Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev