I strongly recommend Jason Bottjen’s component driver for the 26931 (switch) and 26933 (dimmer). Both work great for me on C-7 with 2.2.3.148.
The great feature about these drivers is that they split the motion sensor from the switch/dimmer into separate child devices, and allow the modes (occupancy, etc) to be set from automations.