Xiaomi Gateway - switch.plug_##### random rename

Seems like this convention is not being followed when a sensor is renamed. It changes to motion_status and this breaks update of “no motion since” attribute for motion sensor.

setup:
acpartner gateway for the non-working ones.
regular gateway for working ones.
could this be a factor?

Same as Xiaomi Gateway - switch.plug_##### random rename , the entities look like this:

                "capabilities": null,
                "unique_id": "motion_status158d0001e5262b", # renamed sensor

                "capabilities": {},
                "unique_id": "status158d0001e55784" # working sensor

Log file:

[xiaomi_gateway] Non matching response. Expecting get_id_list_ack, but got get_id_list_rsp