Fix sporadic error during raster display mode (manual cherry pick)
Fix sporadic error during raster display mode (manual cherry pick)

(manual cherry pick of cfe6344)
Flag code where timer function ends pre-emptively. Not sure if this is
ever needed/justified.

jamesjun/spoke