Fix timerslack broken with CM11.0 sync