Unify and shorten event collapse window/delay

Change-Id: Ibd2d038a509f60968d1f3284ffaadb460269de0d