P2 and Mode Button Limitations

As we are migrating a product to Gen3 devices we are realizing limitations presented here and wondering if this will be addressed in future firmware? Seems like a mistake since it limits functionality of the Mode button. We have a space-limited board and the mode button is multi-use. If a user mistakenly presses the button twice it goes to sleep? Seems like an oversight. Can this be disabled through an env variable?

Further, I can't register more than 5 clicks with the button before the count is reset. Is this correct? Can this also be fixed?

0000756320 [app] INFO: Button Click:1
0000756542 [app] INFO: Button Click:2
0000756828 [app] INFO: Button Click:3
0000757095 [app] INFO: Button Click:4
0000757373 [app] INFO: Button Click:5
0000757590 [app] INFO: Button Click:1
0000756542 [app] INFO: Button Click:2
...

One click for signal strength and two clicks for sleep are implemented on all Gen 3 and Gen 4 devices and cannot be turned off.

It's unlikely that the maximum number of clicks will be increased because it's very hard to click more than 5 times, and the mode button is not intended to be used as a user-facing interface.