Depends on D10905
Use proper API
Pairing a device and using the drawer is still possible.
Remove unrelated change
Looks good to me!