Merge "Allow StubVolume to be browseable in Settings"