Merge "Fix NPE when a volume is ejected."