This reverts commit 4f34eb6222.
4f34eb6222
Screen locking timeout is now 40s (30s until warning, 10 more seconds until lock