Service component:

- Upgraded service handler selection logic to consider controller device type and controller drivers