Fixes #7266
Fixes #7119
Fixes #7162. Eject ID verb for laptops is still busted though.
Fixes #7151