Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev