correct ScreenTrack so it properly flushes everything that happened on stop and resets on start
spec for trashable
Merge branch 'master' of https://github.com/discourse/discourse