This makes no sense anymore, secondary will send this after registration, so we need to decide earlier based on the device type.
This change is not backward compatible but this flow hasn't been launched yet so we not breaking anything.
NOTE: It's not that easy to slice this into diffs, so it's possible that in the middle of the stack protocol is not working, it needs to be reviewed as a whole.
Depends on D13965