Fix: Disable timer and screen state separately