[Changed] Sample events to replace previous events rather than all
events persisting until manually closed or used

Change-Id: I3e4db139f7d762a5ebae0ac962c2a31a50098c3a
Merge "[Changed] Sample events to replace previous events rather than all events persisting until manually closed or used" into unstable