I wish the auto-lock duration didn't reset to 30 seconds when turning this off via the keypad

When you have auto-lock on set to something other than 30 seconds, then you temporarily disable auto-lock via the long press of the 0 on the keypad, and then later re-enable auto lock with the long press of the 1 on the keypad, the auto-lock duration gets changed from whatever you set before via the app (I use 5 minutes) to 30 seconds. If it could please remember what it was set to before, and go back to that, that would be far better.