Auto-lock delay resets to 30 seconds after turning auto-unlock and turning it back on again

I prefer a 5 minute delay before auto-lock occurring. If I turn off auto-lock temporarily, either by the slider on the app or long-press of the zero key, and then turn it back on again via the app slider or long press of the one key, the delay gets reset down to 30 seconds. Is there a way to have it remember that I want it at 5 minutes? If not, that would be a useful feature so I don’t have to get the app out when turning auto-lock back on with the keypad on the lock.