Remote locks up after completing body calibration

[naigonakoii]

Describe the bug
When trying to save and exit calibration the remote locks up. This isn't good as it makes calibration of the body impossible.

To Reproduce
Steps to reproduce the behavior:

1. Turn on remote with motor disabled
2. Turn on the drive
3. When paired, hold the right most right button to enter body calibration
4. Hit the right button

Expected behavior
Calibration completes and the remote goes back to normal operation

Additional context
This was a regression of CL 0798685

[gmuddy]

I'm finding that I'm having to press joy buttons (1&5) multiple times to get them to register, even for regular function changes. Haven't found the timing code for those yet but is it checking them frequently enough or getting stuck while checking them? Related?