Backport the mount-tray fixes for unmounting USB