Adjust jit-lock-stealth timings
Simplify and fix margin scroll