Fix views and svents that have the same timestamp get disordered

Refs #5808 

UI tests need to be updated after merge