Merge "Disable eject button for StubVolumes"